removed some non required stuff