Removed unrelated, previously commented code