Use Lang.Class and cleanup.