Remove unncessary codes