Initial clean up, nonsense remains