Remove unncessary code