cleaning up, just static code left for this release