Removing some older no longer used code

Removed some old, commented out, code