Cleaned out most of the errors