Random unnecessary cleanups