Begin code cleanup- comment atoms, remove unused files