removed some unneccessary stuff