Remove broken/wrong/ugly things for cleanup