Delint session for 2014-10-08

Plus some dead code removal