Removed most errors