cleanup

@staugaard