Cleaning

Removing unsed code, cleaning comments