Took out dead code and commented.