Naming cleanup
Remove unneccessary dependencies and sneaky file