Remove this stuff - it's no longer needed here.