Removed some garbage code

12 jobs for issue-21 in 11 minutes and 6 seconds (queued for 3 seconds)