Some random commits/cleanups