Removed more unused code. Commenting.