Last cleanup, should be good now