Cleaned out unused commented out code from various files