Removed more hooks