Cleanup and bad dependancy removal

check commits for details