Remove extra unnescessary code.