cleanup

renamed some methods, removed some stuff that is no longer needed