Cleanup some unneeded code