Removed a few badly designed methods.