Ditching some now useless stuff