Cleaning

Removed unused code.