Remove unneeded reference to COMMON_FOLDER