Cleanup

nothing too much important