Commented out code removed