A little bit of clean up. Removed some unused code.