Remove Extra code