Clean up and started using the no hook model :P