removed some unnecessary stuff for our hack