Removing static code references. Removing old declarations.