Started on some missing exception handling issues. And clean up code tasks. Removed some redundant code.