Fix stuff
Drop dead stuff