removed faulty and unneccessary lines