Much needed clean up