major cleanup changes