removed nonneeded definitions