Cleaned up rake tasks