Fixed master tap directory and removed unused imports.