Extra code removed