Cleanup

26 lines is just six lines too much.