Moved unrelated methods, deleted dead code