More commonsuite, remove unused files