Removed not used methods, still one or two left, this is because of change of the entire approach