Cleanup interface

by Monk JC