Working on removing useless files