ticket:3 Cleanup