Cleanup and track some external from slimroms