Cleaned up a huge mess