Revert "Revert "missed removal of files in last commit""

This reverts commit 34076f889bfe98c6f5b7a07b5dc6526c5e3ea8d4.