Deleted unused/commented out code