clean up some unnecessary stuff, add future notes