Ugh, some cleanup