Added latest cleanups