cleaned up all static references