More coverage
Bugfix
Remove unneccessary code