Removed unused parts..