Remove orignial not used code