Removing warning
Fixing import
Removing unused targets
Changes because of removal of unused targets.