Removing temporary hack
Fixing rake tasks