- removed some unnecessary stuff