Cleaned up a few artifacts