Removed Unused Types and Operators
Updated tests to not use unused types