cleaned up comments a little

also got rid of unnecessary (test) code