removed and simplified