housecleaning

Signed-off-by: Fredrik Carlsson <carl.fredrik.carlsson@gmail.com>