Remove unnecessary functions
Re-enable all hooks