removed some unnecessary stuff