PHB II - Clean up classes