Remove shenanigans