Removed a bit too much for now