Reworked to import hooks
Code cleanup
Code cleanup
Removed empty file