Function removal

Signed-off-by: Ralf Koller <r.koller@gmail.com>