clean up old commented out code, update comments elsewhere