Cleaned upped some obsolete stuff.