Cleanup for some abstraction