removed some clutter from preamble
deleted lots of commented out code