Cleanup some unnecessary code