cleanup. Classes now use base class interfaces for enqueue etc.