Basic clean up without chubby