Order methods, remove obsolete code