removed the hook stuff