Merge "Remove compiled classes list"