Remove deprecated files
Remove unused rake tasks
Remove unnecessary return returns