Finish removing clear & general other fixes

Each commit should standalone.