clean up old commented stuff