Remove working, code cleanup