unused code cleaned
static methods excluded. fixed #1, fixed #2.