Fix, Fix references, Removing unused files