Removed hostTarget checks as discussed