Cleaned up a big mess