Proper cleanup jeez
Even more cleanups