Comment fixes and removed unwanted methods (ci-skip)