Performance optimization and stupid error message purge