Remove other .com stuff which is breaking tests and is probably not reusable