general cleanups (removed unused arguments, methods, etc)