removed some unnecessary stuff.