Updated targets
Removed unusued code