Comment would be good here to explain what is done and cleanup the older code