Cleanup + debug removal