Cleaned up more mess