Code clean up and removal of unneeded features.