Removed all sorts of default cruft