Continued cleanup, should actually work this time