#229 - Removing commented out experimental code