Removed cruft bug