Remove runtime warnings about classes we're not using