Comment and remove dead code. Also comment some know issues.