removed dead code and simplified specifications