Minor changes

Comments and dead code deletion.