Removed some extraneous commented code