cleaning up after some awful broken mess