Cleanup some no used code