Be more consistent with imports
Remove obsolete pass statements