new gems
cleanup and user/task relation