Code cleanup, removing superfluous methods.