Cleanup
Changed startup procedure due to hook changes