Remove superfluous stuff