Removed dead code and other simplifications.