removed not needed features