Clean up destroys to fire hooks
Fix rake dumbness