Remove error logging and redunant code/comments