Cleanup of unused methods.