Cleaning

Deleting useless codes to make it as clean as possible.