ticket:3 Cleaning up