Targeting 1.6, Removed dead code and TODOs