Adding dirtrack for shell matching.
Removing unused stuff.