Removed unused parts from files