Code cleaning

Removed obsolete code