Basic cleanup, should have no effect