Removed debug outputs and fixed targets