Clean up code

2 jobs for master in 36 minutes and 11 seconds (queued for 17 minutes and 9 seconds)