Cleaning code
mainly removing commented debug instructions