first cleanup pass (forgot to commit these two files before)