Fix dependency
Remove obsolete code