Cleaning up legacy code
Get rid of the pesky warnings about rawtypes