Clean up rake tasks somewhat