Comments & cleaning up unused code.