Still trying to get rid of extra files