some deletions

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
comments #5 - controllers (untested)

Signed-off-by: Alexander Skjolden <alex@plastboks.net>