Remove obselete stub
Add a mechanism to omit dependencies