Implement some cleanup methods
Add dummy classes