Took away the bugs and cleaned up