Removed useles sections
Fixes absolute paths
Removed unused use statements