Code cleanup, removed 'unused' types/variables/defines. Less warnings (<10).