Code cleanup.  Remove unnecessary stuff.