removing commented out code and preventing bug in 2014