[MD} Attributes matching and Removing some files and tests committed by mistake

This reverts commit f0ce3c3583b9d42dbfd06621f27e58ec8383a1b5.