removed and sorted using statements.
added support for defining cluster types at setup and enforcing that in code.