Cleanup unnecessary code