refactor static classes out of adapters
remove unneeded refs