Deleted function declaration and fixed a couple of errors

Signed-off-by: Tanel Dettenborn <dettenbo@cs.helsinki.fi>