Class-files removed for merge