removed a load of stuff that was breaking tests..