Some cleanup of unused files