Cleanup some unneeded complexity