Cleaning up statics