Removed commented out lines of code