Removed more unused methods.