added rake comments and remove old features