remove all the shenanigans