Removed dead code, more coverage