Remove cruft, make this actually work