Cleaning up

Removing commented older versions of functions