Removed parts made obsolete by my last commit.