Cleaned up junk