Removed unused parts of codes