Cleaned more old files (reverted from commit 46deccf4d2c8dbb8e498c0884179031778a09603)