Cleaning up, trying to figure out what I actually use/need.