Some minor cleanup (commends+unused exception class)