Removed commented code that should never be used